From e5e3522da6b937f8c6872472078a3499b5a1d1f2 Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Sat, 28 Jul 2018 19:39:44 +0200 Subject: [PATCH] Update to 4.11.0 And refresh patches, which is luckily not that much work this time. --- debian/changelog | 5 +++-- .../misc/toolstestsx86_emulator-pass--no-pie--fno.patch | 2 +- debian/patches/misc/version.diff | 4 ++-- debian/patches/prefix-abiname/config-prefix.diff | 2 +- debian/patches/prefix-abiname/tools-libxc-abiname.diff | 2 +- debian/patches/prefix-abiname/tools-libxl-abiname.diff | 4 ++-- debian/patches/prefix-abiname/tools-xenstore-prefix.diff | 8 ++++---- debian/patches/xenstore/tools-fake-xs-restrict.patch | 2 +- debian/patches/xenstore/tools-xenstore-compatibility.diff | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8bbd1227d7..7a2955a831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -xen (4.10.2~pre+3.b5e9f1e674-1~) UNRELEASED; urgency=medium +xen (4.11.0-1~) UNRELEASED; urgency=medium [ Hans van Kranenburg ] - * Update to 4.10.2-pre commit b5e9f1e674, which also contains: + * Update to 4.11.0, which also contains: - Additional fix for: Unlimited recursion in linear pagetable de-typing XSA-240 CVE-2017-15595 (listed as xsa240-4.8/0004) - Fix x86 PV guests may gain access to internally used pages @@ -61,6 +61,7 @@ xen (4.10.2~pre+3.b5e9f1e674-1~) UNRELEASED; urgency=medium 3.0 for now. - debian/libxenstore3.0.symbols: add xs_control_command * Rebase patches against 4.10 upstream source. + * Rebase patches against 4.11 upstream source. * Add README.source.md to document how the packaging works. * This package builds correctly with gcc 7. (Closes: #853710) * Fix grub config file conflict when upgrading from Stretch. (Closes: #852545) diff --git a/debian/patches/misc/toolstestsx86_emulator-pass--no-pie--fno.patch b/debian/patches/misc/toolstestsx86_emulator-pass--no-pie--fno.patch index 9eee2b34c9..62019c56c9 100644 --- a/debian/patches/misc/toolstestsx86_emulator-pass--no-pie--fno.patch +++ b/debian/patches/misc/toolstestsx86_emulator-pass--no-pie--fno.patch @@ -34,7 +34,7 @@ Signed-off-by: Ian Jackson --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile -@@ -104,6 +104,10 @@ HOSTCFLAGS-x86_64 := -fno-PIE +@@ -140,6 +140,10 @@ HOSTCFLAGS-x86_64 := -fno-PIE $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) diff --git a/debian/patches/misc/version.diff b/debian/patches/misc/version.diff index 5124f0b9df..7178674da6 100644 --- a/debian/patches/misc/version.diff +++ b/debian/patches/misc/version.diff @@ -91,8 +91,8 @@ Patch-Name: version.diff return ""; --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c -@@ -847,14 +847,11 @@ void __init console_init_preirq(void) - #endif +@@ -842,14 +842,11 @@ void __init console_init_preirq(void) + pv_console_set_rx_handler(serial_rx); /* HELLO WORLD --- start-of-day banner text. */ - spin_lock(&console_lock); diff --git a/debian/patches/prefix-abiname/config-prefix.diff b/debian/patches/prefix-abiname/config-prefix.diff index 03711eec63..d3ab54b5ac 100644 --- a/debian/patches/prefix-abiname/config-prefix.diff +++ b/debian/patches/prefix-abiname/config-prefix.diff @@ -8,7 +8,7 @@ Patch-Name: config-prefix.diff --- a/Config.mk +++ b/Config.mk -@@ -82,7 +82,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib +@@ -83,7 +83,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib endif PYTHON ?= python diff --git a/debian/patches/prefix-abiname/tools-libxc-abiname.diff b/debian/patches/prefix-abiname/tools-libxc-abiname.diff index 4f95cfd397..0887d2ebde 100644 --- a/debian/patches/prefix-abiname/tools-libxc-abiname.diff +++ b/debian/patches/prefix-abiname/tools-libxc-abiname.diff @@ -12,7 +12,7 @@ Patch-Name: tools-libxc-abiname.diff XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk --MAJOR = 4.10 +-MAJOR = 4.11 -MINOR = 0 - ifeq ($(CONFIG_LIBXC_MINIOS),y) diff --git a/debian/patches/prefix-abiname/tools-libxl-abiname.diff b/debian/patches/prefix-abiname/tools-libxl-abiname.diff index d27e686d3b..d3f2f1e380 100644 --- a/debian/patches/prefix-abiname/tools-libxl-abiname.diff +++ b/debian/patches/prefix-abiname/tools-libxl-abiname.diff @@ -11,10 +11,10 @@ Patch-Name: tools-libxl-abiname.diff XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk --MAJOR = 4.10 +-MAJOR = 4.11 -MINOR = 0 - --XLUMAJOR = 4.10 +-XLUMAJOR = 4.11 -XLUMINOR = 0 - CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ diff --git a/debian/patches/prefix-abiname/tools-xenstore-prefix.diff b/debian/patches/prefix-abiname/tools-xenstore-prefix.diff index c56f24d1ce..4f529cc45c 100644 --- a/debian/patches/prefix-abiname/tools-xenstore-prefix.diff +++ b/debian/patches/prefix-abiname/tools-xenstore-prefix.diff @@ -19,7 +19,7 @@ Patch-Name: tools-xenstore-prefix.diff install: all --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile -@@ -21,6 +21,8 @@ LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_L +@@ -18,6 +18,8 @@ CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_ CFLAGS += $(CFLAGS-y) LDFLAGS += $(LDFLAGS-y) @@ -28,7 +28,7 @@ Patch-Name: tools-xenstore-prefix.diff CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS += xenstore-write xenstore-ls xenstore-watch -@@ -77,7 +79,7 @@ endif +@@ -79,7 +81,7 @@ endif $(XENSTORED_OBJS): CFLAGS += $(CFLAGS_libxengnttab) xenstored: $(XENSTORED_OBJS) @@ -37,7 +37,7 @@ Patch-Name: tools-xenstore-prefix.diff xenstored.a: $(XENSTORED_OBJS) $(AR) cr $@ $^ -@@ -150,13 +152,13 @@ tarball: clean +@@ -158,13 +160,13 @@ tarball: clean install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(includedir) @@ -54,7 +54,7 @@ Patch-Name: tools-xenstore-prefix.diff $(INSTALL_PROG) xenstore $(DESTDIR)$(bindir) set -e ; for c in $(CLIENTS) ; do \ ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \ -@@ -189,9 +191,9 @@ uninstall: +@@ -197,9 +199,9 @@ uninstall: rm -f $(DESTDIR)$(libdir)/libxenstore.so.$(MAJOR).$(MINOR) rm -f $(addprefix $(DESTDIR)$(bindir)/, $(CLIENTS)) rm -f $(DESTDIR)$(bindir)/xenstore diff --git a/debian/patches/xenstore/tools-fake-xs-restrict.patch b/debian/patches/xenstore/tools-fake-xs-restrict.patch index 4c5d37e9ca..4f5a83b8f8 100644 --- a/debian/patches/xenstore/tools-fake-xs-restrict.patch +++ b/debian/patches/xenstore/tools-fake-xs-restrict.patch @@ -22,7 +22,7 @@ Forwarded: No */ --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c -@@ -792,6 +792,12 @@ unwind: +@@ -798,6 +798,12 @@ unwind: return false; } diff --git a/debian/patches/xenstore/tools-xenstore-compatibility.diff b/debian/patches/xenstore/tools-xenstore-compatibility.diff index 4cb3f1e21d..423c86c8ac 100644 --- a/debian/patches/xenstore/tools-xenstore-compatibility.diff +++ b/debian/patches/xenstore/tools-xenstore-compatibility.diff @@ -29,7 +29,7 @@ Patch-Name: tools-xenstore-compatibility.diff again: --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c -@@ -301,17 +301,19 @@ struct xs_handle *xs_daemon_open_readonl +@@ -307,17 +307,19 @@ struct xs_handle *xs_daemon_open_readonl struct xs_handle *xs_domain_open(void) { -- 2.30.2